-
Notifications
You must be signed in to change notification settings - Fork 12
Pgm tweaks #25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
pmcculler
wants to merge
13
commits into
cwc:master
Choose a base branch
from
pmcculler:pgm_tweaks
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Pgm tweaks #25
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If string.h winds up being needed for some platforms, it can be included through platform-specific defines (e.g. #ifdef WIN32).
Add simple arrow keys to movement (screen), inventory, stats, command selections. Added some include guards Remove some dead code Fix warnings on uncast mallocs Fix getLogin() returning stack memory Adding asserts on possible null dereferences Fixed typo in Grandmaster quest for Tholian monks Making it less likely that extended meditation will cause a permanent HP increase (1/2 -> 1/5) Touched up the Monk messaging a bit Made it possible to join the Monks for free, because free.
Fixed save game load error that caused HP, pow reset.
…hacked the old function back in but did not remove the new LizzardBucket code entirely. Added simple arrow keys to setdir(), country movement, getpos, etc. Fixed typos Fixed static analysis items like malloc(size_t) instead of malloc(int) Fixed stats reset on load bug Fixed inventory spot sqap bug (one bug remains) Added save file scum while debugging code Added auto-display-inventory-slots on up-in-air swap selection Added detection of and friendlier error messages on memory allocation failures.
…weaks Conflicts: Omega/src/defs.h Omega/src/omega.cpp src/OmegaRPG/src/Main.cpp
Able to eat food now, also tweaking several gameplay elements such as wishing for health makes you satiated
Owner
|
Looks like there are some duplicate commits in here, plus some extraneous files (e.g. https://github.com/pmcculler/OmegaRPG/blob/pgm_tweaks/Patrick). I'll review when I get a chance, though one of us will need to rebase out the duplicate commits. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.